Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Sun, 22 Aug 2010 20:04:34 +0000 (16:04 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 22 Aug 2010 20:04:34 +0000 (16:04 -0400)
commitcda551f49c6fed1584070f8757f2ac28535376b3
tree259fb6ae89a56597ea6f0af7dbcd22288142f1af
parent03c9fd6f0585a54a69e676bcb9ddb56295ffce03
parent592842dfa8a242b6559c306ccc736673ffd62124
Merge changes from emacs-23 branch.